From 5ec165e088311491dc7251cc12ef0a03912346c1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 26 May 2019 16:19:44 -0400 Subject: [PATCH] stack sidebar: Make final This should not be subclassed. --- gtk/gtkstacksidebar.c | 13 +++++++++++++ gtk/gtkstacksidebar.h | 23 +---------------------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/gtk/gtkstacksidebar.c b/gtk/gtkstacksidebar.c index 29b39f3d90..3beb195471 100644 --- a/gtk/gtkstacksidebar.c +++ b/gtk/gtkstacksidebar.c @@ -55,6 +55,19 @@ * pages. */ +typedef struct _GtkStackSidebarPrivate GtkStackSidebarPrivate; +typedef struct _GtkStackSidebarClass GtkStackSidebarClass; + +struct _GtkStackSidebar +{ + GtkBin parent; +}; + +struct _GtkStackSidebarClass +{ + GtkBinClass parent_class; +}; + struct _GtkStackSidebarPrivate { GtkListBox *list; diff --git a/gtk/gtkstacksidebar.h b/gtk/gtkstacksidebar.h index 33e2e82ad1..0e6319795a 100644 --- a/gtk/gtkstacksidebar.h +++ b/gtk/gtkstacksidebar.h @@ -34,29 +34,8 @@ G_BEGIN_DECLS #define GTK_TYPE_STACK_SIDEBAR (gtk_stack_sidebar_get_type ()) #define GTK_STACK_SIDEBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_STACK_SIDEBAR, GtkStackSidebar)) #define GTK_IS_STACK_SIDEBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_STACK_SIDEBAR)) -#define GTK_STACK_SIDEBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_STACK_SIDEBAR, GtkStackSidebarClass)) -#define GTK_IS_STACK_SIDEBAR_CLASS(klass)(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_STACK_SIDEBAR)) -#define GTK_STACK_SIDEBAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_STACK_SIDEBAR, GtkStackSidebarClass)) -typedef struct _GtkStackSidebar GtkStackSidebar; -typedef struct _GtkStackSidebarPrivate GtkStackSidebarPrivate; -typedef struct _GtkStackSidebarClass GtkStackSidebarClass; - -struct _GtkStackSidebar -{ - GtkBin parent; -}; - -struct _GtkStackSidebarClass -{ - GtkBinClass parent_class; - - /* Padding for future expansion */ - void (*_gtk_reserved1) (void); - void (*_gtk_reserved2) (void); - void (*_gtk_reserved3) (void); - void (*_gtk_reserved4) (void); -}; +typedef struct _GtkStackSidebar GtkStackSidebar; GDK_AVAILABLE_IN_ALL GType gtk_stack_sidebar_get_type (void) G_GNUC_CONST; -- 2.30.2